# This is a BitKeeper generated patch for the following project: # Project Name: Linux kernel tree # This patch format is intended for GNU patch command version 2.5 or higher. # This patch includes the following deltas: # ChangeSet 1.1484+1.1350.5.6 -> 1.1485 # arch/ppc64/kernel/signal.c 1.28.1.1 -> 1.30 # include/linux/init.h 1.26.1.2 -> 1.29 # include/asm-sparc/unistd.h 1.20.1.7 -> 1.27 # include/linux/sched.h 1.151.1.24 -> 1.164 # include/asm-sparc64/unistd.h 1.19.1.7 -> 1.26 # include/linux/serial.h 1.8.1.2 -> 1.11 # drivers/serial/serial_core.c 1.72.1.2 -> 1.74 # drivers/acpi/pci_root.c 1.13.1.4 -> 1.18 # mm/swap.c 1.52.1.2 -> 1.56 # include/linux/pci_ids.h 1.103.1.23 -> 1.111 # mm/memory.c 1.123.1.18 -> 1.136 # kernel/posix-timers.c 1.19.1.4 -> 1.23 # include/linux/sysctl.h 1.47.1.6 -> 1.53 # drivers/net/tg3.c 1.72.1.40 -> 1.80 # Makefile 1.410.1.28 -> 1.425 # kernel/module.c 1.86.1.9 -> 1.95 # net/ipv4/tcp_input.c 1.39.1.8 -> 1.45 # kernel/sched.c 1.193.1.31 -> 1.206 # kernel/timer.c 1.59.1.14 -> 1.71 # arch/ppc64/kernel/signal32.c 1.40.1.1 -> 1.43 # drivers/video/radeonfb.c 1.26.1.5 -> 1.30 # diff -Nru a/drivers/serial/serial_core.c b/drivers/serial/serial_core.c --- a/drivers/serial/serial_core.c Wed Nov 26 00:39:21 2003 +++ b/drivers/serial/serial_core.c Wed Nov 26 00:39:21 2003 @@ -1862,6 +1862,9 @@ if (flow == 'r') termios.c_cflag |= CRTSCTS; + if (!port->ops) + return 0; + port->ops->set_termios(port, &termios, NULL); co->cflag = termios.c_cflag; diff -Nru a/include/linux/sysctl.h b/include/linux/sysctl.h --- a/include/linux/sysctl.h Wed Nov 26 00:39:21 2003 +++ b/include/linux/sysctl.h Wed Nov 26 00:39:21 2003 @@ -127,6 +127,7 @@ KERN_PANIC_ON_OOPS=57, /* int: whether we will panic on an oops */ KERN_HPPA_PWRSW=58, /* int: hppa soft-power enable */ KERN_HPPA_UNALIGNED=59, /* int: hppa unaligned-trap enable */ + KERN_CACHEDECAYTICKS=60,/* ulong: value for cache_decay_ticks (EXPERIMENTAL!) */ }; diff -Nru a/mm/memory.c b/mm/memory.c --- a/mm/memory.c Wed Nov 26 00:39:21 2003 +++ b/mm/memory.c Wed Nov 26 00:39:21 2003 @@ -121,8 +121,10 @@ } pmd = pmd_offset(dir, 0); pgd_clear(dir); - for (j = 0; j < PTRS_PER_PMD ; j++) + for (j = 0; j < PTRS_PER_PMD ; j++) { + prefetchw(pmd + j + PREFETCH_STRIDE/sizeof(*pmd)); free_one_pmd(tlb, pmd+j); + } pmd_free_tlb(tlb, pmd); }